Merge branch 'master' into allow-examples-to-be-library

author Alexey <kalita.alexey@outlook.com>

Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)

committer GitHub <noreply@github.com>

Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)
author Alexey <kalita.alexey@outlook.com>
Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)
committer GitHub <noreply@github.com>
Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)
diff --cc src/cargo/core/manifest.rs
Simple merge
diff --cc src/cargo/util/toml.rs
Simple merge
author	Alexey <kalita.alexey@outlook.com>
	Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)
committer	GitHub <noreply@github.com>
	Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)
		1	2
src/cargo/core/manifest.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/cargo/util/toml.rs	patch \|	diff1 \|	diff2 \|	blob \| history